Merge "Remove many references to db fields being retired as part of MCR Schema Migration"